/**
* Constructor
*/
-function wfSpecialRecentchanges( $par ) {
- global $wgUser, $wgOut, $wgLang, $wgContLang, $wgTitle, $wgMemc, $wgDBname;
- global $wgRequest, $wgSitename, $wgLanguageCode, $wgContLanguageCode;
- global $wgFeedClasses, $wgUseRCPatrol;
+function wfSpecialRecentchanges( $par, $specialPage ) {
+ global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
- global $wgLinkCache;
$fname = 'wfSpecialRecentchanges';
# Get query parameters
$feedFormat = $wgRequest->getVal( 'feed' );
- $defaultDays = $wgUser->getOption( 'rcdays' );
- if ( !$defaultDays ) { $defaultDays = 3; }
+ $defaults = array(
+ /* int */ 'days' => $wgUser->getDefaultOption('rcdays'),
+ /* int */ 'limit' => $wgUser->getDefaultOption('rclimit'),
+ /* bool */ 'hideminor' => false,
+ /* bool */ 'hidebots' => true,
+ /* bool */ 'hideliu' => false,
+ /* bool */ 'hidepatrolled' => false,
+ /* text */ 'from' => '',
+ /* text */ 'namespace' => null,
+ /* bool */ 'invert' => false,
+ );
+
+ extract($defaults);
+
+
+ $days = $wgUser->getOption( 'rcdays' );
+ if ( !$days ) { $days = $defaults['days']; }
+ $days = $wgRequest->getInt( 'days', $days );
+
+ $limit = $wgUser->getOption( 'rclimit' );
+ if ( !$limit ) { $limit = $defaults['limit']; }
+
+ # list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' );
+ $limit = $wgRequest->getInt( 'limit', $limit );
+
+ /* order of selection: url > preferences > default */
+ $hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor') ? true : $defaults['hideminor'] );
+
- $days = $wgRequest->getInt( 'days', $defaultDays );
- $hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor' ) ) ? 1 : 0;
- list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' );
-
# As a feed, use limited settings only
if( $feedFormat ) {
- $from = null;
- $hidebots = 1;
- $hideliu = 0;
- $hidepatrolled = 0;
global $wgFeedLimit;
if( $limit > $wgFeedLimit ) {
- $limit = $wgFeedLimit;
+ $options['limit'] = $wgFeedLimit;
}
+
} else {
- $from = $wgRequest->getText( 'from' );
- $hidebots = $wgRequest->getBool( 'hidebots', true ) ? 1 : 0;
- $hideliu = $wgRequest->getBool( 'hideliu', false ) ? 1 : 0;
- $hidepatrolled = $wgRequest->getBool( 'hidepatrolled', false ) ? 1 : 0;
-
+
+ $namespace = $wgRequest->getIntOrNull( 'namespace' );
+ $invert = $wgRequest->getBool( 'invert', $defaults['invert'] );
+ $hidebots = $wgRequest->getBool( 'hidebots', $defaults['hidebots'] );
+ $hideliu = $wgRequest->getBool( 'hideliu', $defaults['hideliu'] );
+ $hidepatrolled = $wgRequest->getBool( 'hidepatrolled', $defaults['hidepatrolled'] );
+ $from = $wgRequest->getVal( 'from', $defaults['from'] );
+
# Get query parameters from path
if( $par ) {
$bits = preg_split( '/\s*,\s*/', trim( $par ) );
- if( in_array( 'hidebots', $bits ) ) $hidebots = 1;
- if( in_array( 'bots', $bits ) ) $hidebots = 0;
- if( in_array( 'hideminor', $bits ) ) $hideminor = 1;
- if( in_array( 'minor', $bits ) ) $hideminor = 0;
- if( in_array( 'hideliu', $bits) ) $hideliu = 1;
- if( in_array( 'hidepatrolled', $bits) ) $hidepatrolled = 1;
+ foreach ( $bits as $bit ) {
+ if ( 'hidebots' == $bit ) $hidebots = 1;
+ if ( 'bots' == $bit ) $hidebots = 0;
+ if ( 'hideminor' == $bit ) $hideminor = 1;
+ if ( 'minor' == $bit ) $hideminor = 0;
+ if ( 'hideliu' == $bit ) $hideliu = 1;
+ if ( 'hidepatrolled' == $bit ) $hidepatrolled = 1;
+
+ if ( is_numeric( $bit ) ) {
+ $limit = $bit;
+ }
+
+ if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) {
+ $limit = $m[1];
+ }
+
+ if ( preg_match( '/^days=(\d+)$/', $bit, $m ) ) {
+ $days = $m[1];
+ }
+ }
}
}
+ if ( $limit < 0 || $limit > 5000 ) $limit = $defaults['limit'];
+
# Database connection and caching
$dbr =& wfGetDB( DB_SLAVE );
extract( $dbr->tableNames( 'recentchanges', 'watchlist' ) );
-
+
+ $cutoff_unixtime = time() - ( $days * 86400 );
+ $cutoff_unixtime = $cutoff_unixtime - ($cutoff_unixtime % 86400);
+ $cutoff = $dbr->timestamp( $cutoff_unixtime );
+ if(preg_match('/^[0-9]{14}$/', $from) and $from > wfTimestamp(TS_MW,$cutoff)) {
+ $cutoff = $dbr->timestamp($from);
+ } else {
+ $from = $defaults['from'];
+ }
+
# 10 seconds server-side caching max
$wgOut->setSquidMaxage( 10 );
}
}
- # Output header
- $rctext = wfMsgForContent( "recentchangestext" );
- $wgOut->addWikiText( $rctext );
+ $hidem = $hideminor ? 'AND rc_minor=0' : '';
+ $hidem .= $hidebots ? ' AND rc_bot=0' : '';
+ $hidem .= $hideliu ? ' AND rc_user=0' : '';
+ $hidem .= $hidepatrolled ? ' AND rc_patrolled=0' : '';
+ $hidem .= is_null( $namespace ) ? '' : ' AND rc_namespace' . ($invert ? '!=' : '=') . $namespace;
-
- $now = wfTimestampNow();
- $cutoff_unixtime = time() - ( $days * 86400 );
- $cutoff_unixtime = $cutoff_unixtime - ($cutoff_unixtime % 86400);
- $cutoff = $dbr->timestamp( $cutoff_unixtime );
- if(preg_match('/^[0-9]{14}$/', $from) and $from > wfTimestamp(TS_MW,$cutoff)) {
- $cutoff = $dbr->timestamp($from);
- } else {
- unset($from);
- }
-
- $sk = $wgUser->getSkin();
-
- $showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ));
-
- $hidem = ( $hideminor ) ? 'AND rc_minor=0' : '';
- $hidem .= ( $hidebots ) ? ' AND rc_bot=0' : '';
- $hidem .= ( $hideliu ) ? ' AND rc_user=0' : '';
- $hidem .= ( $hidepatrolled )? ' AND rc_patrolled=0' : '';
-
- $urlparams = array( 'hideminor' => $hideminor, 'hideliu' => $hideliu,
- 'hidebots' => $hidebots, 'hidepatrolled' => $hidepatrolled,
- 'limit' => $limit );
- $hideparams = wfArrayToCGI( $urlparams );
-
- $minorLink = $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
- $showhide[1-$hideminor], wfArrayToCGI( array( 'hideminor' => 1-$hideminor ), $urlparams ) );
- $botLink = $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
- $showhide[1-$hidebots], wfArrayToCGI( array( 'hidebots' => 1-$hidebots ), $urlparams ) );
- $liuLink = $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
- $showhide[1-$hideliu], wfArrayToCGI( array( 'hideliu' => 1-$hideliu ), $urlparams ) );
- $patrLink = $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
- $showhide[1-$hidepatrolled], wfArrayToCGI( array( 'hidepatrolled' => 1-$hidepatrolled ), $urlparams ) );
+ // This is the big thing!
$uid = $wgUser->getID();
// Perform query
- $sql2 = "SELECT $recentchanges.*" . ($uid ? ",wl_user,wl_notificationtimestamp" : "") . " FROM $recentchanges " .
+ $sql2 = "SELECT * FROM $recentchanges FORCE INDEX (rc_timestamp) " .
($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") .
"WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
- "ORDER BY rc_timestamp DESC LIMIT {$limit}";
+ "ORDER BY rc_timestamp DESC";
+ $sql2 = $dbr->limitResult($sql2, $limit, 0);
$res = $dbr->query( $sql2, $fname );
// Fetch results, prepare a batch link existence check query
$batch = new LinkBatch;
while( $row = $dbr->fetchObject( $res ) ){
$rows[] = $row;
-
- // Title
- $batch->add( $row->rc_namespace, $row->rc_title );
-
- // User page link
- $title = Title::makeTitleSafe( NS_USER, $row->rc_user_text );
- $batch->addObj( $title );
-
- // User talk
- $title = Title::makeTitleSafe( NS_USER_TALK, $row->rc_user_text );
- $batch->addObj( $title );
+ if ( !$feedFormat ) {
+ // User page link
+ $title = Title::makeTitleSafe( NS_USER, $row->rc_user_text );
+ $batch->addObj( $title );
+
+ // User talk
+ $title = Title::makeTitleSafe( NS_USER_TALK, $row->rc_user_text );
+ $batch->addObj( $title );
+ }
}
$dbr->freeResult( $res );
- // Run existence checks
- $batch->execute( $wgLinkCache );
-
- if(isset($from)) {
- $note = wfMsg( 'rcnotefrom', $wgLang->formatNum( $limit ),
- $wgLang->timeanddate( $from, true ) );
- } else {
- $note = wfMsg( 'rcnote', $wgLang->formatNum( $limit ), $wgLang->formatNum( $days ) );
- }
- $wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
-
- $note = rcDayLimitLinks( $days, $limit, 'Recentchanges', $hideparams, false, $minorLink, $botLink, $liuLink, $patrLink );
-
- $note .= "<br />\n" . wfMsg( 'rclistfrom',
- $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
- $wgLang->timeanddate( $now, true ), $hideparams.'&from='.$now ) );
-
- $wgOut->addHTML( $note."\n" );
-
if( $feedFormat ) {
rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod );
} else {
+
# Web output...
+
+ // Run existence checks
+ $batch->execute();
+
+ // Output header
+ if ( !$specialPage->including() ) {
+ $wgOut->addWikiText( wfMsgForContent( "recentchangestext" ) );
+
+ // Dump everything here
+ $nondefaults = array();
+
+ wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'limit', $limit , $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'hideminor', $hideminor, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'hidebots', $hidebots, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'hideliu', $hideliu, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'hidepatrolled', $hidepatrolled, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'from', $from, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'namespace', $namespace, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'invert', $invert, $defaults, $nondefaults);
+
+ // Add end of the texts
+ $wgOut->addHTML( '<div class="rcoptions">' . rcOptionsPanel( $defaults, $nondefaults ) . "\n" );
+ $wgOut->addHTML( rcNamespaceForm( $namespace, $invert, $nondefaults) . '</div>'."\n");
+ }
+
+ // And now for the content
+ $sk = $wgUser->getSkin();
$wgOut->setSyndicated( true );
- $list =& new ChangesList( $sk );
+
+ $list = ChangesList::newFromUser( $wgUser );
+
$s = $list->beginRecentChangesList();
$counter = 1;
foreach( $rows as $obj ){
$rc->counter = $counter++;
if ($wgShowUpdatedMarker
- && $wgUser->getOption( 'showupdated' )
&& !empty( $obj->wl_notificationtimestamp )
&& ($obj->rc_timestamp >= $obj->wl_notificationtimestamp)) {
$rc->notificationtimestamp = true;
function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
global $messageMemc, $wgDBname, $wgFeedCacheTimeout;
global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
-
+
if( !isset( $wgFeedClasses[$feedFormat] ) ) {
wfHttpError( 500, "Internal Server Error", "Unsupported feed type." );
return false;
}
-
- $timekey = "$wgDBname:rcfeed:timestamp";
+
+ $timekey = "$wgDBname:rcfeed:$feedFormat:timestamp";
$key = "$wgDBname:rcfeed:$feedFormat:limit:$limit:minor:$hideminor";
-
+
$feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'recentchanges' ) .
' [' . $wgContLanguageCode . ']';
$feed = new $wgFeedClasses[$feedFormat](
* gets it quick too.
*/
$cachedFeed = false;
- if( $feedLastmod = $messageMemc->get( $timekey ) ) {
+ if( ( $wgFeedCacheTimeout > 0 ) && ( $feedLastmod = $messageMemc->get( $timekey ) ) ) {
/**
* If the cached feed was rendered very recently, we may
* go ahead and use it even if there have been edits made
rcDoOutputFeed( $rows, $feed );
$cachedFeed = ob_get_contents();
ob_end_flush();
-
+
$expire = 3600 * 24; # One day
$messageMemc->set( $key, $cachedFeed );
$messageMemc->set( $timekey, wfTimestamp( TS_MW ), $expire );
function rcDoOutputFeed( $rows, &$feed ) {
global $wgSitename, $wgFeedClasses, $wgContLanguageCode;
-
+ $fname = 'rcDoOutputFeed';
+ wfProfileIn( $fname );
+
$feed->outHeader();
-
+
# Merge adjacent edits by one user
$sorted = array();
$n = 0;
}
$first = false;
}
-
+
foreach( $sorted as $obj ) {
$title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title );
$talkpage = $title->getTalkPage();
$feed->outItem( $item );
}
$feed->outFooter();
+ wfProfileOut( $fname );
}
/**
}
/**
- * Used also by Recentchangeslinked
+ * Used by Recentchangeslinked
*/
function rcDayLimitLinks( $days, $limit, $page='Recentchanges', $more='', $doall = false, $minorLink = '',
$botLink = '', $liuLink = '', $patrLink = '' ) {
return $note;
}
+
+/**
+ * Makes change an option link which carries all the other options
+ */
+function makeOptionsLink( $title, $override, $options ) {
+ global $wgUser, $wgLang, $wgContLang;
+ $sk = $wgUser->getSkin();
+ return $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
+ $title, wfArrayToCGI( $override, $options ) );
+}
+
+/**
+ * Creates the options panel
+ */
+function rcOptionsPanel( $defaults, $nondefaults ) {
+ global $wgLang;
+
+ $options = $nondefaults + $defaults;
+
+ if( $options['from'] )
+ $note = wfMsg( 'rcnotefrom', $wgLang->formatNum( $options['limit'] ), $wgLang->timeanddate( $options['from'], true ) );
+ else
+ $note = wfMsg( 'rcnote', $wgLang->formatNum( $options['limit'] ), $wgLang->formatNum( $options['days'] ) );
+
+ // limit links
+ $cl = '';
+ $options_limit = array(50, 100, 250, 500);
+ $i = 0;
+ while ( $i+1 < count($options_limit) ) {
+ $cl .= makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) . ' | ' ;
+ $i++;
+ }
+ $cl .= makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) ;
+
+ // day links, reset 'from' to none
+ $dl = '';
+ $options_days = array(1, 3, 7, 14, 30);
+ $i = 0;
+ while ( $i+1 < count($options_days) ) {
+ $dl .= makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) . ' | ' ;
+ $i++;
+ }
+ $dl .= makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) ;
+
+ // show/hide links
+ $showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ));
+ $minorLink = makeOptionsLink( $showhide[1-$options['hideminor']],
+ array( 'hideminor' => 1-$options['hideminor'] ), $nondefaults);
+ $botLink = makeOptionsLink( $showhide[1-$options['hidebots']],
+ array( 'hidebots' => 1-$options['hidebots'] ), $nondefaults);
+ $liuLink = makeOptionsLink( $showhide[1-$options['hideliu']],
+ array( 'hideliu' => 1-$options['hideliu'] ), $nondefaults);
+ $patrLink = makeOptionsLink( $showhide[1-$options['hidepatrolled']],
+ array( 'hidepatrolled' => 1-$options['hidepatrolled'] ), $nondefaults);
+
+ $hl = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink );
+
+ // show from this onward link
+ $now = $wgLang->timeanddate( wfTimestampNow(), true );
+ $tl = makeOptionsLink( $now, array( 'from' => wfTimestampNow()), $nondefaults );
+
+ $rclinks = wfMsg( 'rclinks', $cl, $dl, $hl );
+ $rclistfrom = wfMsg( 'rclistfrom', $tl );
+ return "$note<br />$rclinks<br />$rclistfrom";
+
+}
+
+/**<F2>
+ * Creates the choose namespace selection
+ *
+ * @access private
+ *
+ * @param mixed $namespace The key of the currently selected namespace, empty string
+ * if there is none
+ * @param bool $invert Whether to invert the namespace selection
+ * @param array $nondefaults An array of non default options to be remembered
+ *
+ * @return string
+ */
+function rcNamespaceForm ( $namespace, $invert, $nondefaults ) {
+ global $wgContLang, $wgScript;
+ $t = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
+
+ $namespaceselect = HTMLnamespaceselector($namespace, '');
+ $submitbutton = '<input type="submit" value="' . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
+ $invertbox = "<input type='checkbox' name='invert' value='1' id='nsinvert'" . ( $invert ? ' checked="checked"' : '' ) . ' />';
+
+ $out = "<div class='namespacesettings'><form method='get' action='{$wgScript}'>\n";
+
+ foreach ( $nondefaults as $key => $value ) {
+ if ($key != 'namespace' && $key != 'invert')
+ $out .= wfElement('input', array( 'type' => 'hidden', 'name' => $key, 'value' => $value));
+ }
+
+ $out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
+ $out .= "
+<div id='nsselect' class='recentchanges'>
+ <label for='namespace'>" . wfMsgHtml('namespace') . "</label>
+ {$namespaceselect}{$submitbutton}{$invertbox} <label for='nsinvert'>" . wfMsgHtml('invert') . "</label>\n</div>";
+ $out .= '</form></div>';
+ return $out;
+}
+
+
/**
* Format a diff for the newsfeed
*/
function rcFormatDiff( $row ) {
+ global $wgFeedDiffCutoff, $wgContLang;
$fname = 'rcFormatDiff';
wfProfileIn( $fname );
-
+
require_once( 'DifferenceEngine.php' );
- $comment = "<p>" . htmlspecialchars( $row->rc_comment ) . "</p>\n";
-
- if( $row->rc_namespace >= 0 ) {
- global $wgContLang;
-
- #$diff =& new DifferenceEngine( $row->rc_this_oldid, $row->rc_last_oldid, $row->rc_id );
- #$diff->showDiffPage();
-
- $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
- $dbr =& wfGetDB( DB_SLAVE );
- $newrev =& Revision::newFromTitle( $titleObj, $row->rc_this_oldid );
- if( $newrev ) {
- $newtext = $newrev->getText();
- } else {
- $diffText = "<p>Can't load revision $row->rc_this_oldid</p>";
- wfProfileOut( $fname );
- return $comment . $diffText;
- }
+ $completeText = '<p>' . htmlspecialchars( $row->rc_comment ) . "</p>\n";
+ if( $row->rc_namespace >= 0 ) {
if( $row->rc_last_oldid ) {
wfProfileIn( "$fname-dodiff" );
- $oldrev =& Revision::newFromId( $row->rc_last_oldid );
- if( !$oldrev ) {
- $diffText = "<p>Can't load old revision $row->rc_last_oldid</p>";
- wfProfileOut( $fname );
- return $comment . $diffText;
- }
- $oldtext = $oldrev->getText();
-
- # Old entries may contain illegal characters
- # which will damage output
- $oldtext = UtfNormal::cleanUp( $oldtext );
-
- global $wgFeedDiffCutoff;
- if( strlen( $newtext ) > $wgFeedDiffCutoff ||
- strlen( $oldtext ) > $wgFeedDiffCutoff ) {
+
+ $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
+ $de = new DifferenceEngine( $titleObj, $row->rc_last_oldid, $row->rc_this_oldid );
+ $diffText = $de->getDiff( wfMsg( 'revisionasof', $wgContLang->timeanddate( $row->rc_timestamp ) ),
+ wfMsg( 'currentrev' ) );
+
+ if ( strlen( $diffText ) > $wgFeedDiffCutoff ) {
+ // Omit large diffs
$diffLink = $titleObj->escapeFullUrl(
'diff=' . $row->rc_this_oldid .
'&oldid=' . $row->rc_last_oldid );
'">' .
htmlspecialchars( wfMsgForContent( 'difference' ) ) .
'</a>';
+ } elseif ( $diffText === false ) {
+ // Error in diff engine, probably a missing revision
+ $diffText = "<p>Can't load revision $row->rc_this_oldid</p>";
} else {
- $diffText = DifferenceEngine::getDiff( $oldtext, $newtext,
- wfMsg( 'revisionasof', $wgContLang->timeanddate( $row->rc_timestamp ) ),
- wfMsg( 'currentrev' ) );
+ // Diff output fine, clean up any illegal UTF-8
+ $diffText = UtfNormal::cleanUp( $diffText );
}
wfProfileOut( "$fname-dodiff" );
} else {
- $diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
+ $rev = Revision::newFromId( $row->rc_this_oldid );
+ if( is_null( $rev ) ) {
+ $newtext = '';
+ } else {
+ $newtext = $rev->getText();
+ }
+ $diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
'<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>';
}
-
- wfProfileOut( $fname );
- return $comment . $diffText;
+ $completeText .= $diffText;
}
-
+
wfProfileOut( $fname );
- return $comment;
+ return $completeText;
}
?>
dépôts / lhc / web / wiklou.git / blobdiff